workspace: Move border radius handling to WorkspaceBackground

Let WorkspaceBackground itself manage its background radius.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1691>

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index f886903a047fe107df6b91b6dedd4981e7d0fb36..47f1c69f2b101791389e3f81ea47b5fc3f49256d 100644 (file)
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -856,7 +856,7 @@ var WorkspaceLayout = GObject.registerClass({
 
 var WorkspaceBackground = GObject.registerClass(
 class WorkspaceBackground extends St.Widget {
-    _init(monitorIndex) {
+    _init(monitorIndex, stateAdjustment) {
         super._init({
             style_class: 'workspace-background',
             layout_manager: new Clutter.BinLayout(),
@@ -867,6 +867,9 @@ class WorkspaceBackground extends St.Widget {
         this._monitorIndex = monitorIndex;
         this._workarea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
 
+        this._stateAdjustment = stateAdjustment;
+        stateAdjustment.connect('notify::value', () => this._updateBorderRadius());
+
         this._bin = new Clutter.Actor({
             layout_manager: new Clutter.BinLayout(),
             clip_to_allocation: true,
@@ -898,6 +901,15 @@ class WorkspaceBackground extends St.Widget {
         this.connect('destroy', this._onDestroy.bind(this));
     }
 
+    _updateBorderRadius() {
+        const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);
+        const cornerRadius = scaleFactor * BACKGROUND_CORNER_RADIUS_PIXELS;
+
+        const backgroundContent = this._bgManager.backgroundActor.content;
+        backgroundContent.rounded_clip_radius =
+            Util.lerp(0, cornerRadius, this._stateAdjustment.value);
+    }
+
     _updateRoundedClipBounds() {
         const monitor = Main.layoutManager.monitors[this._monitorIndex];
 
@@ -942,10 +954,6 @@ class WorkspaceBackground extends St.Widget {
             delete this._workareasChangedId;
         }
     }
-
-    set cornerRadius(radius) {
-        this._bgManager.backgroundActor.content.rounded_clip_radius = radius;
-    }
 });
 
 /**
@@ -960,12 +968,14 @@ class Workspace extends St.Widget {
             layout_manager: new Clutter.BinLayout(),
         });
 
+        const layoutManager = new WorkspaceLayout(metaWorkspace, monitorIndex);
+
         // Background
-        this._background = new WorkspaceBackground(monitorIndex);
+        this._background =
+            new WorkspaceBackground(monitorIndex, layoutManager.stateAdjustment);
         this.add_child(this._background);
 
         // Window previews
-        const layoutManager = new WorkspaceLayout(metaWorkspace, monitorIndex);
         this._container = new Clutter.Actor({
             reactive: true,
             x_expand: true,
@@ -1031,17 +1041,6 @@ class Workspace extends St.Widget {
 
         // DND requires this to be set
         this._delegate = this;
-
-        layoutManager.stateAdjustment.connect('notify::value',
-            () => this._updateBackgroundBorderRadius());
-    }
-
-    _updateBackgroundBorderRadius() {
-        const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);
-        const cornerRadius = scaleFactor * BACKGROUND_CORNER_RADIUS_PIXELS;
-        const { stateAdjustment } = this._container.layout_manager;
-        this._background.cornerRadius =
-            Util.lerp(0, cornerRadius, stateAdjustment.value);
     }
 
     _shouldLeaveOverview() {